Merge branch 'hotfix/1.0.12' v1.0.12
authorIan Weller <ian@gaslightmedia.com>
Tue, 9 Feb 2016 21:56:55 +0000 (16:56 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 9 Feb 2016 21:56:55 +0000 (16:56 -0500)

Trivial merge