Update Scripts
Update scripts
Update 2014-7-18
Merge remote-tracking branch 'upstream/master'