Merge branch 'hotfix/1.0.12' 1.0.12
authorIan Weller <ian@gaslightmedia.com>
Wed, 6 Apr 2016 14:15:17 +0000 (10:15 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 6 Apr 2016 14:15:17 +0000 (10:15 -0400)

Trivial merge