Merge tag 'v1.2.12' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:13:38 +0000 (15:13 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 25 May 2017 19:13:38 +0000 (15:13 -0400)
Fix for auto-deactivate


Trivial merge