JFUSION-155 #comment Fix for invalid & (reference not yet 100% sure that this is a problem else where as well.)
Merge remote-tracking branch 'origin/jfusion2.0' into jfusion2.0