Merge branch 'hotfix/1.0.3'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:55:05 +0000 (14:55 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:55:05 +0000 (14:55 -0500)

Trivial merge