Merge master into gridfit