Sync'd branch releases/beta with upstream @ Wed Oct  1 20:25:32 PDT 2014