Merge tag 'v1.2.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 17:37:25 +0000 (13:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 17:37:25 +0000 (13:37 -0400)
Version 1.2.12


Trivial merge