Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 01:23:42 PDT 2014