Commit af2b969b6f63dafa8c55b88cadbcc7631c2dd30b

Vicent Marti 2014-01-20T16:26:04

Merge pull request #2061 from ethomson/merge_improvements Merge improvements