Sync'd branch releases/beta with upstream @ Wed Oct  1 08:57:39 PDT 2014