Public

Merged from public (private copy) to master.