Sync'd branch releases/aurora with upstream @ Tue Sep 16 02:42:32 PDT 2014