Merge tag 'v1.0.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 20:04:35 +0000 (15:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 20:04:35 +0000 (15:04 -0500)
Version 1.0.12


Trivial merge