Sync'd branch releases/aurora with upstream @ Wed Sep 10 07:57:32 PDT 2014