Merge tag 'v1.0.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 18:14:02 +0000 (14:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 18:14:02 +0000 (14:14 -0400)
Version 1.0.12


Trivial merge