Merge tag 'v1.1.6' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:12 +0000 (14:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 18:36:12 +0000 (14:36 -0400)
v1.1.6


Trivial merge