Merged changes made by Sebastian Weitmann