Sync'd branch releases/aurora with upstream @ Thu Sep  4 05:41:22 PDT 2014