Merge branch 'release/1.4' v1.4
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 16:09:14 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 16:09:14 +0000 (12:09 -0400)

Trivial merge