Merge branch 'master' into amakeev/build-number