Merge branch 'upstream' version 0.14