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