Preparing for launch.
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x_surfsara