Merge pull request #111 from snufkin/stable-acquia

Updating core and contrib