Merge "Update to latest catapult (eae13a4)"