Merge branch 'hotfix/1.0.15' 1.0.15
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 20:17:33 +0000 (16:17 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 20:17:33 +0000 (16:17 -0400)

Trivial merge