no change 20140909
Merge branch 'feature-D'