Nuffield/fox — pull request #5 by Nuffield (2013-04-10 06:36:18+00:00)
Title: committing changes from dev_bugfix to remote/bugfix

++ merging changes from dev_bugfix to remote/bugfix ++