lukepighettif316c37480Merge branch 'feature_custom_transition_settings' of https://github.com/SvenSchoene/fluro into SvenSchoene-feature_custom_transition_settings
f316c37480
Merge branch 'feature_custom_transition_settings' of https://github.com/SvenSchoene/fluro into SvenSchoene-feature_custom_transition_settings