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