Sync'd branch releases/aurora with upstream @ Tue Sep 23 15:04:32 PDT 2014