Merge branch 'master' into imlib2