out of date. merge necessary

@mbartling