Updating Travis info
Dependecy upgrade(s)
Merge remote-tracking branch 'origin/1_2_X' into trunk