Commiting tema_branch changes.  Nothing important was changed.
Merge branch 'master' of https://github.com/timofeysie/wherewithal into tema_branch