Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:10:09 +0000 (14:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:10:09 +0000 (14:10 -0500)

Trivial merge