Repaired merge
12/11/14 merge fixes