This should make it easier to branch the next version.
rebased onto a1bf2195d620d50f8659982a9ced40c5f03f311a
Pull-Request has been merged by siosm
This should make it easier to branch the next version.