Sync'd branch releases/beta with upstream @ Wed Oct 29 07:23:35 PDT 2014