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