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