Merge branch 'release/1.3.1' v1.3.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Nov 2015 15:04:48 +0000 (10:04 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Nov 2015 15:04:48 +0000 (10:04 -0500)

Trivial merge