merged from master: scripting API documentation improvements