Merge branch 'master' into author_nadrow
Merge branch 'master' into author_nadrow
once through all
Merge branch 'author_nadrow'