Merge branch 'hotfix/1.1.7' v1.1.7
authorIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 20:51:52 +0000 (15:51 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 20:51:52 +0000 (15:51 -0500)

Trivial merge