Merge branch 'release/1.3.0' v1.3.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Jan 2016 20:48:25 +0000 (15:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 4 Jan 2016 20:48:25 +0000 (15:48 -0500)

Trivial merge