Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Setup: Fix typo in method name
  Option to setup a copy of the master site during init

Change-Id: I9bd02845d4ff7bb5d5170f423fe817faf1cb8700