Merge pull request #491 from detiber/enterprise-2.2

<oo-install> Pull in latest changes from master