xmas 2013

Signed-off-by: Martin Stone <martin@d7415.co.uk>
(cherry picked from commit 99a13bdad6e1908a51c5cb939d0a49de5c047889)