sync options
Merge branch 'master' into nook
sync options: fixes
Merge branch 'master' into nook