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