OCA/OCB — pull request #51 by OCA-git-bot (2014-09-19 12:09:55+00:00)
Title: Merge commit for 7.0 synchronization

Please pay special attention to to commits where I (@hbrunn) resolved conflicts