Merge tag 'v1.0.12' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:17:30 +0000 (16:17 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:17:30 +0000 (16:17 -0400)
version 1.0.12


Trivial merge