11/12/14 merge