Sync'd branch releases/aurora with upstream @ Fri Oct 24 06:04:39 PDT 2014