Build from master

Build: #1920 was successful Changes by Janne Valkealahti