[zarafa/el6: 2/2] Merge remote branch 'origin/master' into el6