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)
commit3850b84a246bca19e9c3e14d50d7da0a358ecb94
treeaae4bd587a3912e61b47649e5ffb6f86f2c920c4
parent32f5a301e643c216dcd0be505eb2cc74d50161da
parent8397ee93876293c190ab0408ceb50df4d2fec22b
Merge tag 'v2.6.1' into develop

Hotfix for 2 errors that crept into project.