Sync'd branch releases/aurora with upstream @ Sun Sep 28 23:43:32 PDT 2014