Merge tag 'v1.0.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 21:15:58 +0000 (16:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 Nov 2015 21:15:58 +0000 (16:15 -0500)
Version 1.0.12


Trivial merge