Sync'd branch releases/aurora with upstream @ Fri Aug 29 12:26:33 PDT 2014