Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 11:28:39 PDT 2014