Merge branch 'hotfix/1.5.1' v1.5.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 14:50:22 +0000 (10:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 May 2016 14:50:22 +0000 (10:50 -0400)

Trivial merge