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