Merge "Marked new API's since 1.1.4" into devel/master