Merge 101314_811pm

merge with james