Merge branch 'hotfix/1.1.11' v1.1.11
authorIan Weller <ian@gaslightmedia.com>
Wed, 9 Dec 2015 15:02:10 +0000 (10:02 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 9 Dec 2015 15:02:10 +0000 (10:02 -0500)

Trivial merge