Sync'd branch releases/aurora with upstream @ Wed Oct  1 12:34:35 PDT 2014