Bug 906756 - Algorithms for merging givenName and familyName. Master Contact takes precedence
Bug 912554 - [Contacts] Preserve givenName and familyName of the new or being edited contact when merging.
 Bug 912906 - Extend the unit test timeout to 5 seconds for
 browser_db_test.
Bug 905946 - keeping the punctuation character when reverting autofixing
Bug 911357 - Enable build-time overriding of default Gaia wallpaper via GAIA_DISTRIBUTION_DIR. r=yurenju
Merge pull request #11921 from jmcanterafonseca/bug-906756

Bug 906756 - Algorithms for merging givenName and familyName. Master Con...
Merge pull request #11941 from jmcanterafonseca/bug-912554

Bug 912554 - [Contacts] Preserve givenName and familyName of the new or ...
Bump marionette-helper to 0.0.6
Merge pull request #11957 from gaye/bump-marionette-helper

Bump marionette-helper to 0.0.6
Bug 798696 - When viewing single image in Gallery, extremely hard to find button to go back to thumbnail view
Merge pull request #9403 from pivanov/bug-798696

Bug 798696 - When viewing single image in Gallery, extremely hard to find button to go back to thumbnail view
Bug 911395 - Only run tests in 'unit' directories, r=Rik, a=test-only
Merge pull request #11929 from jonallengriffin/unitdir

Bug 911395 - Only run tests in 'unit' directories, r=Rik, a=test-only
Merge pull request #11945 from RudyLu/Bug912906_extend_timeout_forBrowserDBTest

 Bug 912906 - Extend the unit test timeout to 5 seconds for r=benfrancis
Merge pull request #11572 from gitmai/bug-905946-autocorrect-punctuation

Bug 905946 - keeping the punctuation character when reverting autofixing r=davidflanagan