Fixed issue where <br> tags were getting added to shortcode content
Merge remote-tracking branch 'origin/master'