Merge branch 'release/1.3.1' v1.3.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Apr 2015 17:29:04 +0000 (13:29 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Apr 2015 17:29:04 +0000 (13:29 -0400)

Trivial merge