Sync'd branch releases/beta with upstream @ Wed Oct 22 09:55:17 PDT 2014