Add missing semi-colon
Merge branch 'client-overhaul'