Prepare for bugfix release
Merged rebase

Signed-off-by: Fabian Stanke <me@fmos.at>
Bugfix release 1.0.2