Catch zero-array-index when setting location...
Merge remote-tracking branch 'origin/master'