Sync with master branch from @torvalds

![Uploading Screen Shot 2013-05-20 at 9.35.13 PM.png . . .]()