Sync'd branch releases/aurora with upstream @ Wed Sep 17 08:33:33 PDT 2014