Merge remote-tracking branch 'sfdev/2.0' into 2.0
Merge remote-tracking branch 'sfdev/2.0' into 2.0
Merge remote-tracking branch 'sfdev/2.0' into 2.0
BK-850 Try using an existing chapter heading
BK-855 Different user activity in the editing environment should trigger different kind of events
Merge branch 'bjandras-2.0' into 2.0