merge from tonyroberts:master