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