Merge master into getwork branch