Merge branch 'master' into droid-gps