Merge branch 'hotfix/1.0.16'
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 14:01:37 +0000 (10:01 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 14:01:37 +0000 (10:01 -0400)

Trivial merge