Merge branch 'master' into 7329-empty-block-issue
authorradhika <radhika@curoverse.com>
Wed, 23 Sep 2015 19:44:09 +0000 (15:44 -0400)
committerradhika <radhika@curoverse.com>
Wed, 23 Sep 2015 19:44:09 +0000 (15:44 -0400)

Trivial merge