set INASAFE_LOCAL to id
Merge remote-tracking branch 'origin/master'