Ditched MacPorts in favour of Brew.
Merge branch 'master' into atlassian