Upgrade to Chaplin 0.11