Merge aldeed:master into mjgallag:master