Fixed bug with repeated locations
Merge branch '1.4.x'