[MERGE][0.15] Handle empty merge directive texts

[Martin Pool]

Martin Pool has voted +1.
Status is now: Approved
Comment:
merging for 0.15

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C46034D69.3010702%40utoronto.ca%3E