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

Trivial merge