Merge remote-tracking branch 'refs/remotes/apache/master' into avplayer_streaming

# Conflicts:
#	plugin.xml
simple conflict on version with my branches previous version bump.
Resolved to match master.