Merge branch 'hotfix/1.0.15' v1.0.15
authorIan Weller <ian@gaslightmedia.com>
Mon, 15 Feb 2016 20:51:47 +0000 (15:51 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 15 Feb 2016 20:51:47 +0000 (15:51 -0500)

Trivial merge