upstream/2.4+20131018.git79459a2
977f314a · Really revert to version 79459a2b ·