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