Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 17:53:51 PDT 2014