Merge remote-tracking branch 'origin/master' into 1.0.2-wip
Upgrade cloak
use writeEOL
Merge remote-tracking branch 'origin/1.0.2-wip'