bug 602: Doing it right(tm)
Merge branch 'bug-602' into testserver-stable