Fix API doc page redirect loop
Merge branch 'master' into live