integrating drupalhub's additions (with almost zero inspection)