Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 13:23:31 PDT 2014