Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:23:53 +0000 (15:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:23:53 +0000 (15:23 -0400)
v1.1.4


Trivial merge