Feature encapsulate

Jonathan Wilkesrequested to merge
feature-encapsulate into master

Guillem's subpatch encapsulation feature from GSoC

Merge request reports