Merge branch 'hotfix/1.0.17' v1.0.17
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:57:39 +0000 (12:57 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:57:39 +0000 (12:57 -0400)

Trivial merge