*** Submitted as c7e9b5edb8d4 *** CONTRIBUTORS: add Michael Teichgräber R=rsc http://codereview.appspot.com/181072