Restric branches tested by Travis CI.
Merge remote-tracking branch 'origin/master' into SFX-8