Upgraded to upstream version 2013-10-20
Merge branch 'upstream'