Astonex/Antox — pull request #613 by stqism (2014-10-04 07:22:48+00:00)
Title: Manually merge olliehs commits

Signed-off-by: Sean Qureshi