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