Merge branch 'release/1.3.1' v1.3.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jan 2016 18:26:38 +0000 (13:26 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jan 2016 18:26:38 +0000 (13:26 -0500)

Trivial merge