Merge branch 'hotfix/1.0.16' v1.0.16
authorIan Weller <ian@gaslightmedia.com>
Wed, 1 Feb 2017 14:10:06 +0000 (09:10 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 1 Feb 2017 14:10:06 +0000 (09:10 -0500)

Trivial merge