Merge branches 'master' and 'develop'
Removed "quotes" (« ») from the output.

Quotes should now be defined on the container document. This allow us to have a choice of which "symbols" (if any) to use.
Merge branches 'develop' and 'master' into develop