Sync'd branch releases/aurora with upstream @ Sat Sep  6 03:15:34 PDT 2014