Merge branch 'master' into scalable_panels