Merge branch 'master' into bug_236_recordpath