Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 11:18:35 PDT 2014