Merge branch 'feature/glmBlocks' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Jan 2015 21:17:59 +0000 (16:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Jan 2015 21:17:59 +0000 (16:17 -0500)

Trivial merge