Sync'd branch releases/aurora with upstream @ Wed Oct 22 19:06:39 PDT 2014