Merge branch 'master' into alpha-search
Merge branch 'alpha-search' of github.com:itmat/PaGE into alpha-search