Merged from adambard:master