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)
commitf177acf39f17f634d1ab062bab6dda4c08d93d3f
tree60433b6f353ceca9b64fa44d1407fd66634c3925
parent8ce35cc4f38400af6ea26f018b32ea43bace48a2
parentfa4cda479e2047f271faf513275d22a35988bed4
Merge tag 'v1.2.12' into develop

Fix for auto-deactivate