Cherry-picking a range fb3843fb73d9f9d3a323fc36372eb3d223cda587..a02f64826a04cffae4dc1693d54d8eb496ceab6d.

This applies all the commits after a merge of PR #237, excluding the merge itself, making master temporarily incompatible with develop.

Also see a previous two reverting commits, so:

1. master was == develop at start
2. reverted commits fb3843fb73d9f9d3a323fc36372eb3d223cda587..HEAD in one:

* a02f64826a04cffae4dc1693d54d8eb496ceab6d
* 08ce9eb046eb5d1cc2002d0943c854a592341033
* 01235ab4ce232073bb9c5fa2c34fc2228190c2ae
* 4ee03ed14f854d59c576ad32b3d2c0bb4f2533e5
* 89d3270a8adf350531bd63bcce503b3f9eed10c8

3. Reverted a merge commit fb3843fb73d9f9d3a323fc36372eb3d223cda587 as a separate commit, so all commits after 49cc953ee2877952854f6594293d84326215f1e5 and before a merge, were reverted now, as a single commit
4. Cherry-picked fb3843fb73d9f9d3a323fc36372eb3d223cda587..a02f64826a04cffae4dc1693d54d8eb496ceab6d (all the commits mentioned in 2.) as a single commit (this one)