Sync'd branch releases/aurora with upstream @ Tue Sep 30 09:37:32 PDT 2014