Merge branch 'develop' into f/readme-travis
Merge branch 'f/readme-travis' into f/peano