Merge branch 'release/1.3.7' v1.3.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 18:42:36 +0000 (13:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 18:42:36 +0000 (13:42 -0500)

Trivial merge