Merge branch 'sambauers-master'
Prepare 2.1.7 release
Prep for 2.1.6
Better docs, PHPDocs
version 2.1.5