update 4.7 from master (!12 · Merge requests · Documentation / Docs / User Guide

homotechsual requested to merge master into 4.7 Jan 29, 2016

Can't show this merge request because the target branch 4.7 is missing from project documentation/docs/user-en. Close this merge request or update the target branch.