sync with adambard:master