Merge tag 'v1.0.12' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 5 Jul 2016 19:59:26 +0000 (15:59 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 5 Jul 2016 19:59:26 +0000 (15:59 -0400)
version 1.0.12


Trivial merge