Sync'd branch releases/beta with upstream @ Mon Oct 13 19:11:36 PDT 2014