Rebase origin

Review please @coosh (part of the version upgrade @dneufeld just emailed)
Boo.. Not sure why this would be false by default yet the above non_local_traffic is false..