Sync'd branch releases/beta with upstream @ Fri Oct 31 14:14:30 PDT 2014