Merge tag '1.0.12' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 6 Apr 2016 14:16:06 +0000 (10:16 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 6 Apr 2016 14:16:06 +0000 (10:16 -0400)
version 1.0.12


Trivial merge