Pull request with correct commits history

This pull request was done after performing git pull --rebase tango-controls on master branch. And it shows correct number of commits (only 3 commits were made after the latest commit in tango-controls/master)