Sync'd branch releases/aurora with upstream @ Wed Sep 24 06:13:34 PDT 2014