9/25 sync
9/28 Patch
Merge pull request #1 from D3luxe/master

up-stream