update from base repo

...000afa

pull 13 commits into master from 53afad9