modular
Merge git://github.com/sswedish/pipeline
modular