Sync'd branch releases/aurora with upstream @ Wed Oct  1 06:03:36 PDT 2014