wip
Merge remote-tracking branch 'upstream/20140717-match' into 20140717-match