Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 03:28:36 PDT 2014