Merge branch 'hotfix/OME-20130102-1'
Merge branch 'develop'
Merge branch 'develop'
Version 0.6