Nuffield/fox — pull request #2 by Nuffield (2013-04-09 12:17:11+00:00)
Title: from another dev fox 3

testing merge