Merge branch 'hotfix/1.1.11' v1.1.11
authorIan Weller <ian@gaslightmedia.com>
Mon, 22 Feb 2016 16:59:42 +0000 (11:59 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 22 Feb 2016 16:59:42 +0000 (11:59 -0500)

Trivial merge