Implement xp-framework/rfc#266 with PR #22
Merge remote-tracking branch 'upstream/master'