Merge branch 'hotfix/1.0.11' v1.0.11
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:04:50 +0000 (11:04 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 27 Jan 2016 16:04:50 +0000 (11:04 -0500)

Trivial merge