Merged from branch gloor to master