Commit dfe268fd2bb5c793f4c083803609fce9806c6f80 Upgrade suggested by Robert Stepanek. Change-Id: Iaf12e4d8a2fe376187bf6fa8dec8ace83384c8d3