Sync'd branch releases/aurora with upstream @ Wed Oct 29 17:54:38 PDT 2014