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