Merge branch 'hotfix/1.0.15' v1.0.15
authorIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 17:41:27 +0000 (13:41 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 17:41:27 +0000 (13:41 -0400)

Trivial merge