Adding hybrid sample to hybrid_local target
Bugfix around consume()
Merge pull request #627 from bhariharan/master

Bugfix around consume()
Merge branch 'master' into unstable
Merge pull request #628 from bhariharan/unstable

Merge branch 'master' into unstable
Merge pull request #626 from khawkins/add_hybrid_sample

Adding hybrid sample to hybrid_local target
Removing samples target, adding version target
Merge pull request #629 from khawkins/remove_samples

Removing samples target, adding version target