Fixing conflicts from merging master in