Merge branch 'v1.3' into 'v1.2'

# Conflicts:
#   public/action-js/antrian-js/action-kelolapoli.js