Sync'd branch releases/aurora with upstream @ Wed Oct  1 04:32:33 PDT 2014