Merge tag 'v2.1.1' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 16:02:37 +0000 (12:02 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 16:02:37 +0000 (12:02 -0400)
Fix deactivate_plugins out of scope issue


Trivial merge