Sync'd branch releases/aurora with upstream @ Tue Oct 21 13:24:43 PDT 2014