Tweaks for Brisbane 2014
Merge pull request #1024 from mattcallanan/master

Tweaks for Brisbane 2014