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