Merged devel into master.

Large merge - brings master/worker architecture into master.