Apply patches from master