Merge branch 'master' into bv-core
authorlianah <lianahady@gmail.com>
Wed, 27 Mar 2013 18:07:59 +0000 (14:07 -0400)
committerlianah <lianahady@gmail.com>
Wed, 27 Mar 2013 18:07:59 +0000 (14:07 -0400)

Trivial merge