Merge tag 'v1.5.0' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 27 May 2015 13:31:28 +0000 (09:31 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 27 May 2015 13:31:28 +0000 (09:31 -0400)
v1.5.0


Trivial merge