Merge tag '1.0.15' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 20:18:04 +0000 (16:18 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 20:18:04 +0000 (16:18 -0400)
version 1.0.15


Trivial merge