Merge pull request #53 from skyluc/issue/sync-previous-releases

Merge in the changes made for previous releases
Update for config for 4.0.0-m3
Update config for 4.0.0-m3-luna
wip
wip