Merge branch 'devel-0.13' into multipleauthmethods