Fixed BZ#1091804 - Sync fails to synchronise translations that have certain conditional content.
Merge branch 'master' into devel