Merge branch 'johndoh-contact_selection'

Authored by machniak on Wed, Jan 23, 2:39 PM.