Fix #377
Merge branch 'master' into copypaste