Provide fallback for OrderedDict to keep compatibility with python 2.6
Merge branch 'master' of https://github.com/syslabcom/osha.hwccontent