Fix scirun build.
Merge branch 'master' of https://github.com/SCIInstitute/SCIRunGUIPrototype into boost_1_54_0