Sync'd branch releases/aurora with upstream @ Tue Aug 26 23:58:36 PDT 2014