Merge branch 'hotfix/1.0.11' v1.0.11
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 4 Jan 2016 20:25:09 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 4 Jan 2016 20:25:09 +0000 (15:25 -0500)

Trivial merge