Sync'd branch releases/aurora with upstream @ Wed Oct  1 20:12:31 PDT 2014