Pulling doc/swagger changes into master