Sync'd branch releases/aurora with upstream @ Wed Sep 24 09:15:35 PDT 2014