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

Trivial merge