* commit 'af9310ce':
  add channel variable odbc-cdr-ignore-leg to ignore per leg

Merge pull request #346 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:opus-sprop-stereo to master

* commit '37dc3929':
  FS-7829: mod_opus: add sprop-stereo fmtp param (just read it)

* commit 'dc6d7c32':
  FS-7830: mod_opus: added use-dtx param in config file (enables DTX on the encoder, announces in fmtp)

Merge pull request #348 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:opus-cleanup-bugfix-asymmetric-fmtp to master

* commit '65135c5f':
  FS-7832: fixes when comparing local and remote fmtp params

restore patches from revert, this is lame, you need to bootstrap to fix it.  625^H^H^H0 days without having to rebootstrap

FS-7830: mod_opus: added use-dtx param in config file (enables DTX on the encoder, announces in fmtp)

mod_conference new features:
add conference layout "1x1+2x1" and add to layout group grid
add conference flag video-bridge-first-two conference flag
add conference flag video-required-for-canvas to only use avatars for members with video
add conference flag video-muxing-personal-canvas
add conf_verto_ prefix for variables to pass on live array subscription notice
add api command conference foo vid-canvas <member_id|all|last|non_moderator> [<newval>]
add api command conference foo vid-layer <member_id|all|last|non_moderator> [<newval>]
add api command conference foo vid-watching-canvas <member_id|all|last|non_moderator> [<newval>]
changed api command conference foo vid-layout, args are now "<layout name>|group <group name> [<canvas_id>]"
add channel vars you can set before entering conference video_initial_canvas and video_initial_watching_canvas
add many new output status vars to conference list api
add new conference member flag "second-screen"
add config param video-canvas-count
add config param video-super-canvas-label-layers
add config param video-super-canvas-show-all-layers
add config param video-super-canvas-bgcolor

verto client:
add google login
add hipchat js file
conf_verto_hipchatURL= to control what hipchat server appears if any
global device init and overrides
allow passing sessid
add confMan.canvasCount
add handling of multiple canvases and launching them, and controlling all of their layouts
re-layout moderator controls and add support for changing the watching and input canvas and layers
when launching another canvas, watch subscriptions for the original call so we can automatically close the additional window
maintain camera settings on call recovery

* commit 'c797e948':
  FS-7824 Add functionality for capturing screenshots from both legs to uuid_write_png

With this patch, uuid_write_png is able to capture screenshots from both
legs of a bridged video call. It still expects a uuid and filename for
the first two arguments. If given a third argument, it must be concat
or split. If concat is specified, screenshots from both ends are taken
and written side by side to the given filename. If one image is shorter
than the other then it is padded with black and vertically centered. If
the third argument is split then the two screenshots are written to
separate files. In this case, a second filename is expected as a fourth
argument.

FS-7820 updated switch_event.c to have benchmark framework, and updated .gitignore file to ignore binary test files

 and docs

Merge pull request #319 in FS/freeswitch from ~LAZEDO/freeswitch:feature/aditional_sofia_events to master

* commit '58043483':
  FS-7773 [mod_sofia] transfer events #resolve

C level unit testing and micro benchmarking framework, including one
example unit test.

Merge pull request #341 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:opus-keep-fec-on-improve to master

* commit '244331aa':
  FS-7819: mod_opus: restore bitrate after increase (if there's no more packet loss) , added step for 60 ms

FS-7819: mod_opus: restore bitrate after increase (if there's no more packet loss) , added step for 60 ms

* commit 'f767fe5e':
  Fixed Bug/FS-7754

Merge pull request #287 in FS/freeswitch from ~ARTURZ/freeswitch:FS-7405-condition-regex-all-proper-fix to master

* commit '9d6ad1f9':
  FS-7405 Fix <condition regex="all"> to work with time conditions

* commit '4dc7b3b2':
  FS-7760 #resolve

added xml fetch for channels to externally support nightmare transfer
depends on channel-xml-fetch-on-nightmare-transfer profile param (default is disabled)

fixes missing entry in switch_xml.c to enable the xml binding

Merge pull request #277 in FS/freeswitch from ~ARTURZ/freeswitch:FS-7639-audio-sent-as-dtmf to master

* commit '8b1ce0f1':
  FS-7639 Fix rtp_session->recv_te and rtp_session->cng_pt comparisions in switch_rtp.c

* commit '48b44832':
  FS-7198 add coma separated values and reverse ranges for time-of-day and day-of-week matches

Merge pull request #338 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:opus-ptime-60ms-support to master

* commit '76bdd2b0':
  FS-7809: mod_opus: added 60 ms ptime for Opus at 8 khz  ( opus@8000h@60i )

* commit 'be6e6ea5':
  FS-7801: mod_opus: added support to set CBR mode

* commit '410850fa':
  FS-7685 fix Dutch numbers pronunciation