Sync'd branch releases/aurora with upstream @ Wed Oct 29 14:32:34 PDT 2014