Merge branch 'release/1.5.0' v1.5.0
authorLaury GvR <laury@gaslightmedia.com>
Wed, 27 May 2015 13:31:14 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 27 May 2015 13:31:14 +0000 (09:31 -0400)

Trivial merge