NOJIRA Merge master into pip branch

Merge, merge, merge. Merge!