Merge branch 'release/1.5.1' v1.5.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 16:01:11 +0000 (12:01 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 16:01:11 +0000 (12:01 -0400)

Trivial merge