Merge branch 'develop'
Use us format on popup. Danish ruined the filter.
Merge branch 'master' into develop