First commit to branch patch-1

This should be committed to ghachey:master