38d2463 Imported Upstream version 20130927

Authored and Committed by ahs3 10 years ago