[2014-12-09] Module Intrastructure
Merge remote-tracking branch 'origin/master'