fixed Exception: requestFeature() must be called before adding content
Merge remote-tracking branch 'upstream/master'