Test update... expecting to see some failing test because of strict standards warnings.
Merge remote-tracking branch 'origin/master'