Added 3.6
Merge branch 'master' of github.com:Jegp/BPRD2013