Update to master of all current changes