Merge branch 'master' into 7329-empty-block-issue
authorradhika <radhika@curoverse.com>
Tue, 22 Sep 2015 16:47:26 +0000 (12:47 -0400)
committerradhika <radhika@curoverse.com>
Tue, 22 Sep 2015 16:47:26 +0000 (12:47 -0400)

Trivial merge