Merge branch 'master' into bv-core
authorlianah <lianahady@gmail.com>
Thu, 21 Mar 2013 23:26:49 +0000 (19:26 -0400)
committerlianah <lianahady@gmail.com>
Thu, 21 Mar 2013 23:26:49 +0000 (19:26 -0400)

Trivial merge