merged changes from repo on ubuntu which won't push
Here's the merge