Sync'd branch releases/aurora with upstream @ Wed Oct 29 14:45:35 PDT 2014