Checkout
Jim Jagielski
committed
on 27 Aug 14
Merge r1620932 from trunk:

Make up-to-date

Reviewed/backported by: jim