Merge branch 'bugfixes' into nfs-for-2.6.38