Sync with upstream - 20130329