Merge branch 'release/1.0.3' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Jun 2015 20:41:56 +0000 (16:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 18 Jun 2015 20:41:56 +0000 (16:41 -0400)

Trivial merge