Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 08:38:50 PDT 2014