Sync'd branch releases/aurora with upstream @ Wed Oct 22 14:01:42 PDT 2014