Merge remote-tracking branch 'upstream/master' into bootstrap-extra-routes

Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com>

# Conflicts:
#	bootstrap/bootstrap_test.go