Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 20:38:26 PDT 2014