Merge tag 'v1.1.10' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:01:06 +0000 (12:01 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:01:06 +0000 (12:01 -0400)
Fixed merge conflict that made it into hotfix.


Trivial merge