Merge proposals dependent on lp:~edwin-grubbs/launchpad/bug-655802-person-vocabulary-timeout

1. bug-655802-person-vocabulary-timeout
2. Dependent merge proposals