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