Sync'd branch releases/aurora with upstream @ Thu Oct 16 06:27:37 PDT 2014