Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-03-17' into...