Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 04:28:45 PDT 2014