Merge tag 'v1.2.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:27 +0000 (12:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 28 Jun 2016 16:31:27 +0000 (12:31 -0400)
Version 1.1.12


Trivial merge