3.0.11

Created a new branch for 3.1 
Merging 3.0.11 with the master branch