Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:18:00 +0000 (08:18 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:18:00 +0000 (08:18 -0500)

Trivial merge