Davy Durham - 2013-12-27

this was already applied in svn trunk/ at r1984