Merge master from jmacglashan