Upgraded to upstream version 2014-06-07
Merge branch 'upstream'
Upgraded to upstream version 2014-09-22
Merge branch 'upstream'