Merge master into 0.6.5-dm-plugin