Fix wrong address pool being advertised
Merge remote-tracking branch 'upstream/master'