Merge remote-tracking branch 'my-origin/master'
Updated API Reference (markdown)
Updated API (markdown)