Merge tag 'v1.0.15' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 17:41:48 +0000 (13:41 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 31 May 2016 17:41:48 +0000 (13:41 -0400)
version 1.0.15


Trivial merge