Merge tag 'v1.6.12' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 18:55:15 +0000 (13:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 18:55:15 +0000 (13:55 -0500)
Version 1.6.12


Trivial merge