Sync'd branch releases/aurora with upstream @ Fri Oct 17 06:19:41 PDT 2014