Merge tag 'v1.0.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Nov 2015 14:47:19 +0000 (09:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Nov 2015 14:47:19 +0000 (09:47 -0500)
Version 1.0.12


Trivial merge