Buildroot merge attempt 2

Now with added history!