Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 10:04:36 PDT 2014