Upgrade to latest 09 October 2013

Upstream commit ca6ec50d22c5ceefecece4846c4e36a79c05e92c