Sync'd branch releases/aurora with upstream @ Sun Oct 19 12:17:43 PDT 2014