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