merge from leecrossley master