synchronization with beta branch
Merge branch 'master' into nook
repackaging
Merge branch 'master' into nook