Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 12:31:21 PDT 2014