Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 10:28:39 PDT 2014