Sync'd branch releases/beta with upstream @ Tue Oct 28 23:41:30 PDT 2014