Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 16:43:19 +0000 (12:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 16:43:19 +0000 (12:43 -0400)

Trivial merge