Merge pull request #344 from ferstaberinde/dev

v3-1-0 RC4
Merge pull request #357 from ferstaberinde/dev

v3-1-0 RC5
Fixed #359
Merge pull request #369 from ferstaberinde/dev

v3-1-0 RC6
Merge pull request #371 from ferstaberinde/dev

v3-1-0
* using forceAddUniform by default
Merge pull request #374 from Wolfenswan/dev-forceAddUniform

ForceAddUniform