Merge pull request #3 from loxdegio/3.16-geek

3.16 geek
Upgrade to v3.16.1-geek
Merge pull request #4 from loxdegio/master

Upgrade to v3.16.1