Merged in LP-56_split_acroplus_factors (pull request #2)