Update for latest pa-client snapshot
Fix { replacement in browser
Merge remote-tracking branch 'origin/master'