Merge branch 'release/1.0.11'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 18:09:09 +0000 (13:09 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 18:09:09 +0000 (13:09 -0500)

Trivial merge