Sync'd branch releases/aurora with upstream @ Wed Oct 22 09:51:13 PDT 2014