mountain-lion
8343a6bf · Cherrypick commit [1d5e744cc6] from the trunk in order to avoid leaving a... ·