add master changes to devjs branch