Merge branch 'release/1.3.0' v1.3.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 20:30:22 +0000 (16:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 20:30:22 +0000 (16:30 -0400)

Trivial merge