Merge tag 'v1.1.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 20:55:33 +0000 (16:55 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 20:55:33 +0000 (16:55 -0400)
v1.1.11


Trivial merge