Merge tag 'v1.0.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:10:16 +0000 (14:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 19:10:16 +0000 (14:10 -0500)
Version 1.0.12


Trivial merge