Merge branch 'release/1.4.0' v1.4.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 19:51:40 +0000 (15:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 19:51:40 +0000 (15:51 -0400)

Trivial merge