linux 3.9.6
Merge pull request #634 from aristidb/master

Linux 3.9.6