Upgraded to upstream version 2013-06-27
Merge branch 'upstream'
Fix include file case name error