Merge pull request #194 from maksimov/2014.08

2014.08 - bringing up to date with all performance patches
Merge pull request #198 from maksimov/2014.08

Removing incorrectly included request tracking stuff, also correcting co...