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