dev-master 'll stay with 4.1 for now  (due to illuminate/view incompatibility)