Merge remote-tracking branch 'ecryptfs/next'