Sync'd branch releases/aurora with upstream @ Wed Oct  1 17:46:34 PDT 2014