Sync'd branch releases/aurora with upstream @ Fri Oct 10 12:07:30 PDT 2014