Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:53 +0000 (16:40 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 20:40:53 +0000 (16:40 -0400)
v1.1.5


Trivial merge