Merge tag 'v1.0.11' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 22:02:34 +0000 (17:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 22:02:34 +0000 (17:02 -0500)
v1.0.11


Trivial merge