wp 1126
20140818
upload
Merge branch 'master', remote branch 'origin'