Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 07:16:53 PDT 2014