Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Id2c51e600a1d87498278b18b669128f3136878d0
Merge topic '15078_fix_point_sprite' into next

4979c43a BUG #15078: Fix update issue with PointSprite plugin.
Merge topic '15090_fix_state_loading_issues' into next

f815af75 BUG #15090: Fixed state loading + time issue.