Trying to fix navigation issue on Safari
Merge remote-tracking branch 'origin/master'