Merge tag 'v1.0.15' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 15 Feb 2016 20:52:29 +0000 (15:52 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 15 Feb 2016 20:52:29 +0000 (15:52 -0500)
version 1.0.15


Trivial merge