synchronization with nook branch
Merge branch 'master' into beta