Don't forget to check against the primary address!

see #552
Merge branch '1.1.x'