2013 10 09 update
Merge remote-tracking branch 'origin/master'