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