Sync'd branch releases/aurora with upstream @ Wed Oct  1 09:18:32 PDT 2014