Rc/2014 07 02

merge changes made onto last week's rc back into master
@wedaly @rocha