Upgrade to apm 0.61