Merge branch 'hotfix/1.5.1' v1.5.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:40:50 +0000 (14:40 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 29 Feb 2016 19:40:50 +0000 (14:40 -0500)

Trivial merge