Merge branch 'master' of https://git.code.sf.net/p/opencamera/code