3.1.6

First release of the stripped version

This is the first release of my version with everything taken out. After this the release title and description will just be copied from trunk

From trunk:
Bug fixes