Merge pull request #1 from init6/master

Sync with upstream
Merge pull request #64 from nilekurt/master

Bumped geek-sources-3.15-r1 to 3.15.1