Bug 863600 - Intermittent browser_toolbox_options.js; r=me
Merge fx-team to m-c.
Merge inbound to m-c.
Bug 863116 - MOZ_ALWAYS_INLINE should not inline in debug builds (r=Waldo)
Merge m-c to inbound.