Rubicon 1.3 Update
Merge branch 'original'