Setup instructions
Merge branch 'master' into 20130208

* master:
  Setup instructions