committing changes from dev_bugfix to remote/bugfix
Merge pull request #5 from Nuffield/dev_bugfix

committing changes from dev_bugfix to remote/bugfix
(1)from fox -dev_bugfix to remote/bugfix
Merge pull request #6 from Nuffield/dev_bugfix

(1)from fox -dev_bugfix to remote/bugfix
Merge branch 'master' into dev_bugfix
(2) mofiled from fox client - dev_bugfix branch
Merge pull request #7 from Nuffield/dev_bugfix

Dev bugfix
(3)
Merge pull request #8 from Nuffield/dev_bugfix

(3)
Merge pull request #9 from Nuffield/bugfix

Bugfix