Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 13:54:56 PDT 2014