Merge branch 'release/1.3.0' v1.3.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 16:50:30 +0000 (12:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 16:50:30 +0000 (12:50 -0400)

Trivial merge