Sync'd branch releases/beta with upstream @ Tue Oct 28 15:26:43 PDT 2014