Sync'd branch releases/aurora with upstream @ Wed Oct  1 18:18:36 PDT 2014