release version 2.3.7 on 2013-09-06_15-11-16
Merge branch 'upstr'