-- ammending the last one with the everything else that's required to make it work.
Merge remote-tracking branch 'origin/master'