Sync'd branch releases/beta with upstream @ Wed Oct 22 12:50:36 PDT 2014