Merge branch 'hotfix/1.1.10' v1.1.10
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 18:27:27 +0000 (14:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 18:27:27 +0000 (14:27 -0400)

Trivial merge