Merge branch 'master' into lqc-trunk