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)
commitfd80100b94d1cbf0863cb45db37473339e63be8c
treefcde70742c703d8a2d7a56a10c407b10d8272c08
parent342b323024a56cf1af182f285dbcc69c3642b5b4
parent964b20e5c00bcb74b394275760002d7be23ac272
Merge tag 'v2.1.1' into develop

Fix deactivate_plugins out of scope issue