Merge "fix docs" into nyc-dev am: 23ca16865a
am: 08651fb868

* commit '08651fb86876711b5de8f22b2c9904c02b99aab9':
  fix docs