merge in master with changes to reorg js