Add the stuff from my ~/Sandbox/libs-dev
Merge remote-tracking branch 'origin/master'