Merge branch 'master' into 'pay_wanjl_0830'

# Conflicts:
#   conf/application.ini
#   conf/cli.ini
add: merge ini