Merge branch 'hotfix/1.0.11' v1.0.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 20:35:13 +0000 (15:35 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 20:35:13 +0000 (15:35 -0500)

Trivial merge