updating 4.7 to match master (!101 · Merge requests · Documentation / Docs / User Guide

homotechsual requested to merge github/fork/joannechester/4.7 into 4.7 Apr 03, 2016

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