Merge branch 'master' into bv-core
authorlianah <lianahady@gmail.com>
Thu, 21 Mar 2013 18:33:45 +0000 (14:33 -0400)
committerlianah <lianahady@gmail.com>
Thu, 21 Mar 2013 18:33:45 +0000 (14:33 -0400)

Trivial merge