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