[zarafa/el6] (2 commits) ...Merge remote branch 'origin/master' into el6