Sync'd branch releases/aurora with upstream @ Sun Aug 31 23:11:32 PDT 2014