Merge branch 'release/1.3.0' v1.3.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:30:56 +0000 (11:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:30:56 +0000 (11:30 -0400)

Trivial merge