Backout b17e9a0ea116 and 50725de303ef, restoring Feature model. Fixes #161 and re-opens #65.

--HG--
extra : amend_source : f14bc0bf6c9f04e16d30ce0abf7bcb944f41ebea
Update changelog