Review for develop 1.0.1

Please review the commits to be integrated into develop-1.0.1!
(Start at top of develop-1.0.1 until top of review-develop-1.0.1)

Thank you very much!