Merge branch 'master' into next
Merge branch 'master' into next

Conflicts:
	gnuradio-runtime/lib/gr_block_detail.cc
Merge branch 'master' into next

Conflicts:
	gr-uhd/include/gr_uhd_usrp_sink.h
	gr-uhd/include/gr_uhd_usrp_source.h
	gr-uhd/lib/gr_uhd_usrp_sink.cc
	gr-uhd/lib/gr_uhd_usrp_source.cc
uhd: fix accidentally deleted file from previous merge
runtime: frontend interface changes
cmake: always find PMT includes in FindGnuradio.cmake
update FindGnuradio.cmake to use the standard method for libgnuradio-pmt
blocks: interleaved_short_to_complex switch to volk, allow vector short input option
Merge branch 'master' into next
uhd: enhanced version of usrp_spectrum_sense.py
Merge branch 'master' into next

Conflicts:
	gr-uhd/examples/python/usrp_spectrum_sense.py
runtime: fix for gr_enabled_realtime_scheduling
build: fixed GnuradioConfig files for OOTs to use.
docs: fixed warnings.
Merge branch 'master' into next

Conflicts:
	CMakeLists.txt
build: updated config cmake file for next changes.
runtime: id docstring clearer
pmt: import on all client swig stuff
Merge branch 'master' into next
build: minor tweaks for swig, warnings.