Merge branch 'master' into gh-pages
skip empty string funcs
Merge branch 'gh-pages'