MergeAPI-1.6intoAPI-1.5

This branch has no changes from API-1.5