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