Making sure methods are only called server-side
Merge branch 'origin/master'