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