Merge tag '1.0.2' into develop

1.0.2
Move some stuff around.

This also fixes a problem for filter-flow-release-start-version, when a
release was started teh wrong version was created.
Merge branch 'release/2.0.0'