turn document constructors into cont constructors
Merge remote-tracking branch 'upstream/master'