Sync'd branch releases/beta with upstream @ Mon Oct  6 05:47:36 PDT 2014