updated devel to be on sync with master after 1.2 update