Initial commit
Merge remote-tracking branch 'upstream/master' into 7.x-1.x