NOJIRA Merge master into pip branch

Give us this day our daily merge...