gforge Merge branch 'develop'