Merge tag 'v1.0.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 16:43:28 +0000 (12:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 16:43:28 +0000 (12:43 -0400)
Version 1.0.12


Trivial merge