NOJIRA Merge master into pip branch

A merge a day keeps the git-fu away.