Merge release/cheetah into develop

When there is a % sign in the translation handle, we should use a "blocktrans" instead. Otherwise we will have issues with Transifex.