Merge branch 'hotfix/1.1.6' v1.1.6
authorIan Weller <ian@gaslightmedia.com>
Mon, 19 Dec 2016 17:47:09 +0000 (12:47 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 19 Dec 2016 17:47:09 +0000 (12:47 -0500)

Trivial merge