Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 18:23:40 PDT 2014