Merge remote-tracking branch 'origin/master' into develop
Fix curly quotes on href
Merge remote-tracking branch 'origin/develop'