Sync'd branch releases/beta with upstream @ Fri Oct 24 06:17:33 PDT 2014