2014-08-21 linyb
Merge remote-tracking branch 'origin/master'