synchronization with beta branch (code is not compilable at the moment)
code is compilable
Merge branch 'master' into nook
plugin launch
Merge branch 'master' into nook
synchronization with beta branch
Merge branch 'master' into nook