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