update 2014-08-24
Merge remote-tracking branch 'origin/master'
update 2014-08-24