Merge branch 'hotfix/1.1.12' v1.1.12
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:51:28 +0000 (14:51 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:51:28 +0000 (14:51 -0400)

Trivial merge