GIRAPH-796
GIRAPH-442
GIRAPH-757
GIRAPH-758
GIRAPH-758
GIRAPH-759
GIRAPH-760
GIRAPH-760
GIRAPH-793
Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' into GIRAPH-KIBBLE

Conflicts:
	src/site/site.xml