am ff95897f: am d0b02b52: am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."

* commit 'ff95897fea96805d244bff380ea9b57785593c40':