Merge branch 'comverge_1.3.0'