Merge branch 'hotfix/1.0.16'
authorIan Weller <ian@gaslightmedia.com>
Mon, 29 Aug 2016 12:43:38 +0000 (08:43 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 29 Aug 2016 12:43:38 +0000 (08:43 -0400)

Trivial merge