Merge tag 'v2.6.1' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 22 Sep 2016 21:03:45 +0000 (17:03 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 22 Sep 2016 21:03:45 +0000 (17:03 -0400)
Hotfix for 2 errors that crept into project.


Trivial merge