
Merge branch 'master' into arc Conflicts: MNCoder/IntermediateObjects/MNAttributedString.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASFont.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASForegroundColor.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASKern.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASLigature.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASParagraphyStyle.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASStrokeColor.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASStrokeWidth.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASUnderlineStyle.m MNCoder/IntermediateObjects/NSAttributedStrings/MNASVerticalForms.m