release version 2.3.5 on 2013-06-06_20-27-28
release version 2.3.6 on 2013-07-02_17-37-13
Merge branch 'upstr'