Sync'd branch releases/beta with upstream @ Fri Oct  3 07:47:39 PDT 2014