Merge from fishman/catgs 2014/10/06