Merge "Cleanup code to remove warning messages at buildtime." into devel/wrt2