Merge pull request #3298 from rubenk/contextswitch-nosysctl-h