Sync'd branch releases/aurora with upstream @ Sat Sep  6 08:33:33 PDT 2014