pinchy - 2013-07-05

updated patch to latest source.