fix8/fix8 — pull request #42 by dakka (2013-12-18 10:41:49+00:00)
Title: Master to Dev

Pull back changes from master into dev