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