Sync'd branch releases/aurora with upstream @ Wed Sep 10 12:26:32 PDT 2014