Apply Merge-20131218 where all conflicts from re-sync from M4SE were fixed.

Apply Merge-20131218 where all conflicts from re-sync from M4SE were fixed.