Merge remote-tracking branch 'upstream/master'

    Conflicts:
        lib/client/location.js