Bug 733107: Search for reconcile status doesn't work right.
Merge branch 'maint'
Merge remote-tracking branch 'upstream/master'