Updated
Merge branch 'pull_cbenien_20140814171748300'