Support 2012 codebase upgrade
Merge pull request #1 from unikent/upgrade/2012

Support 2012 codebase upgrade