Merge branch 'lwip-merge' into elflink