12/11/14 merge