UPDATE 20131122
Merge branch 'master' into Common