Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 03:13:37 PDT 2014