Sync'd branch releases/aurora with upstream @ Wed Oct  1 04:25:04 PDT 2014