Merge branch 'hotfix/1.1.3' v1.1.3
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:53:50 +0000 (08:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 13:53:50 +0000 (08:53 -0500)

Trivial merge