Merge branch 'devel' of robotics.mvla.net:git/brian/2013 into brian-devel

Pulled down Brian's latest changes.