merge from lmccart/master