MD: work towards 2013 session
Merge remote-tracking branch 'origin/master'