Merge branch 'updated-1.0' into mer-gstreamer1

Conflicts:
	src/plugins/gstreamer/camerabin/camerabinsession.cpp

Change-Id: Ic828fdde674f905a0c5156d6ad91bf8d9b3943a6