setting initial merge info for the 5_18 branch
Authored by: alphamyk 2014-02-12
Parent: [r7663]
Child: [r7665]