Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I6fc7f770c7b522a32f20bf4386b02a40340f136e
Merge topic '15090_fix_state_loading_issues' into next

f815af75 BUG #15090: Fixed state loading + time issue.
Merge topic '15078_fix_point_sprite' into next

4979c43a BUG #15078: Fix update issue with PointSprite plugin.