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