Nuffield/fox — pull request #3 by Nuffield (2013-04-10 05:59:48+00:00)
Title: modifying file under dev_bugfix branch !!!

Merging changes from dev_bugfix to remote bugfix branch