Merge branch 'hotfix/1.0.12' v1.0.12
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 20:04:25 +0000 (15:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 20:04:25 +0000 (15:04 -0500)

Trivial merge