Merge branch 'release/1.3.1' v1.3.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 15 Aug 2016 14:38:20 +0000 (10:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 15 Aug 2016 14:38:20 +0000 (10:38 -0400)

Trivial merge